how to deal with conflict

join shbcf.ru